From ce02e5cacca06352fd7a89e06dbf65a4523230a0 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Sun, 5 Dec 2004 12:47:42 +0000
Subject: [PATCH] Use g_fopen().

2004-12-05  Tor Lillqvist  <tml@iki.fi>

	* demos/gtk-demo/main.c (load_file): Use g_fopen().

	* demos/gtk-demo/images.c (progressive_timeout): Use
	g_fopen(). Open png file in binary mode.
---
 ChangeLog               | 7 +++++++
 ChangeLog.pre-2-10      | 7 +++++++
 ChangeLog.pre-2-6       | 7 +++++++
 ChangeLog.pre-2-8       | 7 +++++++
 demos/gtk-demo/images.c | 3 ++-
 demos/gtk-demo/main.c   | 3 ++-
 6 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba156a7ded..e6e8a9e9a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+	* demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+	* demos/gtk-demo/images.c (progressive_timeout): Use
+	g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 	
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ba156a7ded..e6e8a9e9a2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+	* demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+	* demos/gtk-demo/images.c (progressive_timeout): Use
+	g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 	
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ba156a7ded..e6e8a9e9a2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+	* demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+	* demos/gtk-demo/images.c (progressive_timeout): Use
+	g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 	
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ba156a7ded..e6e8a9e9a2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-12-05  Tor Lillqvist  <tml@iki.fi>
+
+	* demos/gtk-demo/main.c (load_file): Use g_fopen().
+
+	* demos/gtk-demo/images.c (progressive_timeout): Use
+	g_fopen(). Open png file in binary mode.
+
 2004-12-02  Matthias Clasen  <mclasen@redhat.com>
 	
 	* configure.in: Bump version
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index d9262c54e5..4bb3fb81bd 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -13,6 +13,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include "demo-common.h"
@@ -195,7 +196,7 @@ progressive_timeout (gpointer data)
 	}
       else
 	{
-	  image_stream = fopen (filename, "r");
+	  image_stream = g_fopen (filename, "rb");
 	  g_free (filename);
 
 	  if (!image_stream)
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 3382f72f96..c434ae0b50 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -5,6 +5,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 #include <demos.h>
 
@@ -465,7 +466,7 @@ load_file (const gchar *filename)
       return;
     }
 
-  file = fopen (full_filename, "r");
+  file = g_fopen (full_filename, "r");
 
   if (!file)
     g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));
-- 
2.30.2